gnomeos: Fix gudev introspection build

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 37a715738daf139f242f17cbf8e90395f38c2da7..0720ec74b084e0836fc7cd9d75f608ee94d5b27d 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -317,8 +317,10 @@
 
                {"src": "git:git://git.kernel.org/pub/scm/linux/hotplug/udev.git",
                 "branch": "175",
-                "config-opts": ["--disable-documentation"],
-                "patches": ["udev-autogen.patch", "udev-docs.patch"]},
+                "config-opts": ["--disable-documentation",
+                                "--enable-udev_acl"],
+                "patches": ["udev-autogen.patch", "udev-docs.patch",
+                            "udev-gudev-libtool.patch"]},
 
                {"src": "cgwalters:expat-git-mirror.git",
                 "patches": ["expat-autogen.patch"]},

diff --git a/gnomeos/3.4/udev-gudev-libtool.patch b/gnomeos/3.4/udev-gudev-libtool.patch
new file mode 100644 (file)
index 0000000..fa26529
--- /dev/null
+++ b/gnomeos/3.4/udev-gudev-libtool.patch
@@ -0,0 +1,25 @@
+From 124cef85d3a20f30a3411a9f42a8a478c47d3f63 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 27 Jan 2012 17:37:23 -0500
+Subject: [PATCH] gudev: Ensure we use libtool to link
+
+Otherwise we won't find the shared library which is hidden in .libs.
+---
+ Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7a35395..c264398 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -392,6 +392,7 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
+               --library=gudev-1.0 \
+               --library-path=$(top_builddir)/libudev \
+               --library-path=$(top_builddir)/extras/gudev \
++              --libtool="$(LIBTOOL)" \
+               --output $@ \
+               --pkg=glib-2.0 \
+               --pkg=gobject-2.0 \
+-- 
+1.7.6.5
+